[IA64] don't export GPFN_xxx flags.

GPFN_INV_MASK takes 4 bits, but 1 bit is sufficient.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/include/asm-ia64/linux-xen/asm/pgtable.h b/xen/include/asm-ia64/linux-xen/asm/pgtable.h
index 659c2a933f4be88ccdb4427653f4058b115070b8..30adb093389f05208ec7976c0ef54552a608acbe 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h
+++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h
@@ -68,6 +68,20 @@
 #ifdef XEN
 #define _PAGE_VIRT_D           (__IA64_UL(1) << 53)    /* Virtual dirty bit */
 #define _PAGE_PROTNONE         0
+
+/* domVTI */
+#define GPFN_MEM               (0UL << 60)     /* Guest pfn is normal mem */
+#define GPFN_FRAME_BUFFER      (1UL << 60)     /* VGA framebuffer */
+#define GPFN_LOW_MMIO          (2UL << 60)     /* Low MMIO range */
+#define GPFN_PIB               (3UL << 60)     /* PIB base */
+#define GPFN_IOSAPIC           (4UL << 60)     /* IOSAPIC base */
+#define GPFN_LEGACY_IO         (5UL << 60)     /* Legacy I/O base */
+#define GPFN_GFW               (6UL << 60)     /* Guest Firmware */
+#define GPFN_HIGH_MMIO         (7UL << 60)     /* High MMIO range */
+
+#define GPFN_IO_MASK           (7UL << 60)     /* Guest pfn is I/O type */
+#define GPFN_INV_MASK          (1UL << 63)     /* Guest pfn is invalid */
+
 #else
 #define _PAGE_PROTNONE         (__IA64_UL(1) << 63)
 #endif

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 62fbaf6dae23d6f398c1be0cb3fa246a293e2f17..6e2b55dd0d34399efa8bacc3815b9ebfa052428f 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -48,18 +48,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 
 typedef unsigned long xen_ulong_t;
 
-#define GPFN_MEM          (0UL << 56) /* Guest pfn is normal mem */
-#define GPFN_FRAME_BUFFER (1UL << 56) /* VGA framebuffer */
-#define GPFN_LOW_MMIO     (2UL << 56) /* Low MMIO range */
-#define GPFN_PIB          (3UL << 56) /* PIB base */
-#define GPFN_IOSAPIC      (4UL << 56) /* IOSAPIC base */
-#define GPFN_LEGACY_IO    (5UL << 56) /* Legacy I/O base */
-#define GPFN_GFW          (6UL << 56) /* Guest Firmware */
-#define GPFN_HIGH_MMIO    (7UL << 56) /* High MMIO range */
-
-#define GPFN_IO_MASK     (7UL << 56)  /* Guest pfn is I/O type */
-#define GPFN_INV_MASK    (31UL << 59) /* Guest pfn is invalid */
-
 #define INVALID_MFN       (~0UL)
 
 #define MEM_G   (1UL << 30)